Shuffle the ordering around some more (position before realizing) fixing

Tue Mar 26 14:46:50 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around
        some more (position before realizing) fixing problems with
        arrows popping up at the wrong time (#73386), hopefully not
        introducing other problems. (Reported by Ettore Perrazoli, others)

diff --git a/ChangeLog b/ChangeLog
index f9ed9bab00d1d06a05350f1f3a96562938ca9a06..8c323c19a4e5c37e49b30f495ac1169eb6e2c2ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Mar 26 14:46:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around
+       some more (position before realizing) fixing problems with 
+       arrows popping up at the wrong time (#73386), hopefully not
+       introducing other problems. (Reported by Ettore Perrazoli, others)
+
 2002-03-26  Dave Camp  <dave@ximian.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f9ed9bab00d1d06a05350f1f3a96562938ca9a06..8c323c19a4e5c37e49b30f495ac1169eb6e2c2ef 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Mar 26 14:46:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around
+       some more (position before realizing) fixing problems with 
+       arrows popping up at the wrong time (#73386), hopefully not
+       introducing other problems. (Reported by Ettore Perrazoli, others)
+
 2002-03-26  Dave Camp  <dave@ximian.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f9ed9bab00d1d06a05350f1f3a96562938ca9a06..8c323c19a4e5c37e49b30f495ac1169eb6e2c2ef 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Mar 26 14:46:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around
+       some more (position before realizing) fixing problems with 
+       arrows popping up at the wrong time (#73386), hopefully not
+       introducing other problems. (Reported by Ettore Perrazoli, others)
+
 2002-03-26  Dave Camp  <dave@ximian.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f9ed9bab00d1d06a05350f1f3a96562938ca9a06..8c323c19a4e5c37e49b30f495ac1169eb6e2c2ef 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Mar 26 14:46:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around
+       some more (position before realizing) fixing problems with 
+       arrows popping up at the wrong time (#73386), hopefully not
+       introducing other problems. (Reported by Ettore Perrazoli, others)
+
 2002-03-26  Dave Camp  <dave@ximian.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f9ed9bab00d1d06a05350f1f3a96562938ca9a06..8c323c19a4e5c37e49b30f495ac1169eb6e2c2ef 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Mar 26 14:46:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around
+       some more (position before realizing) fixing problems with 
+       arrows popping up at the wrong time (#73386), hopefully not
+       introducing other problems. (Reported by Ettore Perrazoli, others)
+
 2002-03-26  Dave Camp  <dave@ximian.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f9ed9bab00d1d06a05350f1f3a96562938ca9a06..8c323c19a4e5c37e49b30f495ac1169eb6e2c2ef 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Mar 26 14:46:50 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkmenu.c (gtk_menu_popup): Shuffle the ordering around
+       some more (position before realizing) fixing problems with 
+       arrows popping up at the wrong time (#73386), hopefully not
+       introducing other problems. (Reported by Ettore Perrazoli, others)
+
 2002-03-26  Dave Camp  <dave@ximian.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_button_press): Free the path

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 47db2b26bf9cc00b7b97eee3ea83011206da38ae..fd9caca9b21434989227fb1901930ce9178d4f14 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -748,8 +748,12 @@ gtk_menu_popup (GtkMenu                *menu,
    */
   gtk_widget_show (GTK_WIDGET (menu));
 
+  /* Position the menu, possibly changing the size request
+   */
+  gtk_menu_position (menu);
+
   /* Compute the size of the toplevel and realize it so we
-   * can position and scroll correctly.
+   * can scroll correctly.
    */
   {
     GtkRequisition tmp_request;
@@ -765,8 +769,6 @@ gtk_menu_popup (GtkMenu                 *menu,
     gtk_widget_realize (GTK_WIDGET (menu));
   }
 
-  gtk_menu_position (menu);
-
   gtk_menu_scroll_to (menu, menu->scroll_offset);
 
   /* Once everything is set up correctly, map the toplevel window on